More house keeping: Fix a lot of different details.

This will also help keeping the project in shape for future SDK versions.