Fixes for numerous areas