More fixes

 * Addresses issue