AppStudio fixes