Fixing php 5.4 strict errors