Data access fixes

Signed-off-by: Piotr Carewicz <piotr.carewicz@googlemail.com>