Fixed some acceleration issues