Some fixes and small corrections