Minor fixes, design decisions