Bug fixes & polish