Minor fixes during competition