Fixes and features