Fixes after Christoffer's review