potential bug fixes, will confirm later