Fixes for alamgamation build