Fixes and small changes