Fix some more issues after feedback