Some fix. Work in progress