Resolved issues with latest commits