Remkonoteboom/4.3

Cumulative fixes for 4.3
When testing, I had something below this line and then removed it.  It's harmles.