Resolved more bugs