Further improvements and using fixes