Small fixes for errors appeared during maintenance tests..