Fixes

This branch resolves some issues encountered on a laptop.