[master] Fixing Errors on Ubuntu