Fix functional bugs v1.1