Fixes for Erlang R16B03

Update my Erlang installation to R16B03, and this is what needed fixing. Please review.