Fix CGSize/NSSize conversion

Also add Universal building