Add: small bug corrections