General Code Fixes, nothing special here, move along
more