Fixes?
Updated to hopefully match current master