Minor fixes after analysis