Some integrational fixes.