Fix some 'bugs'