Last round of fixed, rolling up to 0.9.3