Fix compile errors from #23