Some tweaks here and there