0212: Small fixes + improvements.