Misc Fixes / Changes

Nothing really controversial here, just some cleaning.