Smartass tweaks