Resolved errors and bugs