A few fixes, trying to bring back to basic functionality