inconsequential changes that didn't go into last commit for some reason. Fixed build basically.