Fixes, polish