More Swift compatibility updates