Minor improvements..