I'm not against tweeks here and there, I think a control area for Scotty would be a nice touch. There's nothing in the last movie that definitively shows that such an area does not exist.
And I'm sure they will have to film somewhere other than the brewery. I doubt they get access to it again. I'm just saying that they should strive to keep some semblance of visual continuity between the two films. I should feel like I'm viewing the same ship.