Version 96 Fixes