WIP - Fixed two bugs