Fixes and minor changes