More workarounds for SDK2013