fixes for compliation errors and issue model