Fixes stuff as requested by pchote