Improvements/fixes