Various cleanup + spec fixes