General style and sample fixes