Fixes for a few things...