Fix for Common file issues