Fixes on new installation
Fixed errors