Fixed comments blocks