Compile fixes and changes to consts.