Fix some nightlies

Couple of fixes for 2014-11-20. Still has some warnings, so not quite ready to merge, but opening now because i got everything to compile.