Quick fixes for kik demo