Fixes, highlights