Bug fixings.