minor fixes once again