Sample.app fixes