Some minor changes (test UIViewController)