Some small changes from CodeDay