CFK-81: Fix PHP notices