Fixes and new feature requests