Some minor fixes nyana
..