Fixed complaints