Lotta fixes