Uniform bug fixes