WIP: Some fixes.