Small Fixes

Nothing to see here... Carry on.