Final Initial Fixes