Some tweaks to misc. stuff...