Made updates to reduces errors when running with jb-gapps installed