Fix basic lint problems