Fix issues and bugs