WIP - Fixing issues