Minor tweaks and stuffs