Fixing issues (WIP)