Tweaked minor bugs