Bug fixes, cosmetics