Minor fixes:
includes, trivial erlang:displays removed