BIG SHOTS: Small patch

Just some minor bug fixes :)