Including requested fixes