More basic bug fixes