minor fixes to comply with C99's new pointer aliasing rules