A few small fixes and include whitespace plugin.