Fixed small issues
Fixed install issues