Demo: Small fixes