Fixing up some acceleration shenanigans