Misc bored tweaks