Commiting a Couple Changes Left Over to Move to Manuel Branch