Pushing some changes to try to get some compiler help