misc fixes does not build yet