Small Fixes that bugger me a lot...