Small fixes + fix by Ale