1.6.1 release preps and compile fixes