Merged in bug fixes