Fixes

Hello! 

Please review my commits.