fixes for 32bit build
Merge branch 'overhaul' of darwin:scout into overhaul