Fixes and more rules