Minor updates, type hinting, to fix strict warnings in php 5.4