Fixes and incremental improvements