Fixed resources issues