Fixed build errors, see #1