Bux fixes and improvements