Some tweaks, and hopefully fixes