Initial static focus support, minor bug fixes