Added better iPad support, fixed SubtleLock issue