Fix of further errors / cleanup