Resolving issues and bugs