Some more fixes after proofreading