make requested fixes