Fixes and small additions