Fixes for whitespace problem on oracle #40