Fix some ....... bugs...... Stop laughing.