Small changes from MrFlix