Resolved common bugs