Some assembly hacks