More frame state-related fixes and improvements