V1 :: Minor fixes