m00r fixes