Small fixes

Signed-off-by: Vitaly Chipounov <vitaly.chipounov@epfl.ch>