Various fixes

Mainly exposed by updating the showcase application