Adding requested fixes