Minor little tweaks