[FIXED] Several small things