updates to work with 2.6

Signed-off-by: Stephen Gran <stephen.gran@piksel.com>