Fixed two other stupid bugs