Fixed old merge conflict from work in progress stuff. Builds correctly now.