Follow up bug fixes