Fix declarations due strict errors