Few changes for fix camera