Resolved a few bugs (marked in Asana).