Commiting whats left of the lrb-specific changes