Changed include path
Removed unused argument
More sanity checks