Fixes based on line comments