Resolved some warnings