Quick fixes and improvements