Multiple major bux fixes