Fixes, improvements