Merging in bug fixes