Rwsem Fixes, thanks Hashcode :)

Change-Id: I54ab4c2e5b22cfed39dfdf94f702d20181137912