Various fixes, snapshot build now working