Fixes for a chunk of stuff