Fix up some branch icons
Fix incorrect array type in construction
Remove some warnings about NSInteger conversions