small fixes; compiles again