couple of temporary fixes