misc fixes: marked a bunch of attributes as final or volatile