Additional updates

Additional updates to comply with @MikeTheMan's feedback.