Dev: Fixing some bugs