Final fixes #1346