Krawitz fixes