Public fix
Add some fixes