Minor adjustments

Minor adjustments long overdue to be synced