Fixes for optional.h