Small fixes in order to run showcase on this 0.5.x