fix build errors, re-add options