Some fixes. Shouldn't have pushed that yesterday ... o_O