Fixed constraint issues; XCode 6.1 fixes