Static -> fixes