Small requested fixes