Stuff fixing and cleanup