Resolved several issues