Small fixes for extent checking