Fixing some things...