last minute fixses