Fixed multiply and updated conversion routines