Fixing up super simple cases