Some fixes and features