Small fixes when trying real app