Skip to content
Fixes for 4.12:

Fix two compilation issues