compile fixes, tweaks

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Merge pull request #2425 from caelaislinn/bleeding-edge-freeze

compile fixes -.-