Updates and fixes for a variety of issues