Bug Fixes March 16th