Fixed Billy's Fixes