RobL: tweaks